Use merge base for lintdiff comparison instead of main tip#4981
Merged
Conversation
denik
force-pushed
the
denik/lintdiff-merge-commit
branch
from
4a1a7a3 to
ca50ce0
Compare
This ensures lintdiff only picks up files changed on the current branch, not files that changed on main since the branch point. Task: 001.md Co-authored-by: Isaac
denik
force-pushed
the
denik/lintdiff-merge-commit
branch
from
ca50ce0 to
d6e6ae4
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes
lintdiff.pynow usesgit merge-baseto find the branch point before computing changed files, instead of diffing against the ref tip directly.Why
When main advances after a branch is created,
git diff mainincludes files changed on main since the branch point. This causesmake lintto flag issues in files the branch author never touched.Tests
No automated tests —
lintdiff.pyis a thin wrapper around git + golangci-lint with no existing test infrastructure. Verified manually.